From b730e70aed0050ab725e52db37e57fc890e6df35 Mon Sep 17 00:00:00 2001 From: robertl Date: Sun, 26 Mar 2006 04:34:52 +0000 Subject: [PATCH] NMEA was never more than a skeleton in jeeps. Nuke it. --- gpsbabel/jeeps/gps.h | 3 - gpsbabel/jeeps/gpsmem.c | 1181 ----------------------------------- gpsbabel/jeeps/gpsmem.h | 61 -- gpsbabel/jeeps/gpsnmea.h | 312 --------- gpsbabel/jeeps/gpsnmeafmt.h | 44 -- gpsbabel/jeeps/gpsnmeaget.h | 43 -- gpsbabel/jeeps/gpsserial.c | 92 --- 7 files changed, 1736 deletions(-) delete mode 100644 gpsbabel/jeeps/gpsnmea.h delete mode 100644 gpsbabel/jeeps/gpsnmeafmt.h delete mode 100644 gpsbabel/jeeps/gpsnmeaget.h diff --git a/gpsbabel/jeeps/gps.h b/gpsbabel/jeeps/gps.h index 7fd2ad701..fa3af7ea0 100644 --- a/gpsbabel/jeeps/gps.h +++ b/gpsbabel/jeeps/gps.h @@ -182,13 +182,10 @@ typedef struct GPS_SLap_Data { #include "gpscom.h" #include "gpsfmt.h" #include "gpsmath.h" -#include "gpsnmea.h" #include "gpsmem.h" #include "gpsrqst.h" #include "gpsinput.h" #include "gpsproj.h" -#include "gpsnmeafmt.h" -#include "gpsnmeaget.h" time_t gps_save_time; double gps_save_lat; diff --git a/gpsbabel/jeeps/gpsmem.c b/gpsbabel/jeeps/gpsmem.c index f5a893459..ed070c08a 100644 --- a/gpsbabel/jeeps/gpsmem.c +++ b/gpsbabel/jeeps/gpsmem.c @@ -301,1184 +301,3 @@ void GPS_Way_Del(GPS_PWay *thys) return; } - - - -/* @func GPS_Gsv_New *********************************************** -** -** Satellites in view constructor -** -** @return [GPS_PGsv] virgin siv -**********************************************************************/ - -GPS_PGsv GPS_Gsv_New(void) -{ - GPS_PGsv ret; - - if(!(ret=(GPS_PGsv)malloc(sizeof(GPS_OGsv)))) - return NULL; - - ret->valid = ret->inview = 0; - *ret->elevation = *ret->azimuth = *ret->strength = '\0'; - - return ret; -} - - - -/* @func GPS_Gsv_Del *********************************************** -** -** Satellites in view destructor -** -** @param [w] thys [GPS_PGsv *] siv to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Gsv_Del(GPS_PGsv *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Rme_New *********************************************** -** -** Position error constructor -** -** @return [GPS_PRme] virgin rme -**********************************************************************/ - -GPS_PRme GPS_Rme_New(void) -{ - GPS_PRme ret; - - if(!(ret=(GPS_PRme)malloc(sizeof(GPS_ORme)))) - return NULL; - - ret->valid = 0; - ret->hpe = ret->vpe = ret->spe = (double)0.; - - return ret; -} - - - -/* @func GPS_Rme_Del *********************************************** -** -** Position error destructor -** -** @param [w] thys [GPS_PRme *] posn error to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Rme_Del(GPS_PRme *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Wpl_New *********************************************** -** -** Waypoint constructor -** -** @return [GPS_PWpl] virgin rme -**********************************************************************/ - -GPS_PWpl GPS_Wpl_New(void) -{ - GPS_PWpl ret; - - if(!(ret=(GPS_PWpl)malloc(sizeof(GPS_OWpl)))) - return NULL; - - ret->valid = 0; - *ret->wpt = '\0'; - ret->lat = ret->lon = (double)0.; - - return ret; -} - - - -/* @func GPS_Wpl_Del *********************************************** -** -** Waypoint destructor -** -** @param [w] thys [GPS_PWpl *] waypoint to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Wpl_Del(GPS_PWpl *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Gll_New *********************************************** -** -** Position (geographic lat/lon) constructor -** -** @return [GPS_PGll] virgin gll -**********************************************************************/ - -GPS_PGll GPS_Gll_New(void) -{ - GPS_PGll ret; - - if(!(ret=(GPS_PGll)malloc(sizeof(GPS_OGll)))) - return NULL; - - ret->valid = 0; - ret->time = (time_t)0; - ret->lat = ret->lon = (double)0.; - ret->dv='\0'; - - return ret; -} - - - -/* @func GPS_Gll_Del *********************************************** -** -** Position destructor -** -** @param [w] thys [GPS_PGll *] posn to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Gll_Del(GPS_PGll *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Rmz_New *********************************************** -** -** Altitude constructor -** -** @return [GPS_PRmz] virgin altitude -**********************************************************************/ - -GPS_PRmz GPS_Rmz_New(void) -{ - GPS_PRmz ret; - - if(!(ret=(GPS_PRmz)malloc(sizeof(GPS_ORmz)))) - return NULL; - - ret->valid = ret->dim = ret->height = 0; - - return ret; -} - - - -/* @func GPS_Rmz_Del *********************************************** -** -** Altitude destructor -** -** @param [w] thys [GPS_PRmz *] altitude to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Rmz_Del(GPS_PRmz *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Rmm_New *********************************************** -** -** Datum constructor -** -** @return [GPS_PRmm] virgin datum -**********************************************************************/ - -GPS_PRmm GPS_Rmm_New(void) -{ - GPS_PRmm ret; - - if(!(ret=(GPS_PRmm)malloc(sizeof(GPS_ORmm)))) - return NULL; - - ret->valid = 0; - *ret->datum = '\0'; - - return ret; -} - - - -/* @func GPS_Rmm_Del *********************************************** -** -** Datum destructor -** -** @param [w] thys [GPS_PRmm *] datum to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Rmm_Del(GPS_PRmm *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Bod_New *********************************************** -** -** Bearing constructor -** -** @return [GPS_PBod] virgin bearing -**********************************************************************/ - -GPS_PBod GPS_Bod_New(void) -{ - GPS_PBod ret; - - if(!(ret=(GPS_PBod)malloc(sizeof(GPS_OBod)))) - return NULL; - - ret->valid = 0; - *ret->dest = *ret->start = '\0'; - ret->True = ret->mag = (double)0.; - - return ret; -} - - - -/* @func GPS_Bod_Del *********************************************** -** -** Bearing destructor -** -** @param [w] thys [GPS_PBod *] bearing to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Bod_Del(GPS_PBod *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Rte_New *********************************************** -** -** Route (NMEA) constructor -** -** @return [GPS_PRte] virgin bearing -**********************************************************************/ - -GPS_PRte GPS_Rte_New(void) -{ - GPS_PRte ret; - - if(!(ret=(GPS_PRte)malloc(sizeof(GPS_ORte)))) - return NULL; - - ret->valid = ret->rte = 0; - ret->type = '\0'; - ret->wpts = NULL; - - return ret; -} - - - -/* @func GPS_Rte_Del *********************************************** -** -** Route (NMEA) destructor -** -** @param [w] thys [GPS_PRte *] route to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Rte_Del(GPS_PRte *thys) -{ - if((*thys)->wpts) - free((void *)(*thys)->wpts); - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Rmc_New *********************************************** -** -** Minimum recommended specific constructor -** -** @return [GPS_PRmc] virgin minimum -**********************************************************************/ - -GPS_PRmc GPS_Rmc_New(void) -{ - GPS_PRmc ret; - - if(!(ret=(GPS_PRmc)malloc(sizeof(GPS_ORmc)))) - return NULL; - - ret->valid = 0; - ret->time = (time_t)0; - *ret->date = ret->warn = '\0'; - ret->lat = ret->lon = ret->speed = ret->cmg = ret->magvar = - (double)0.; - - return ret; -} - - - -/* @func GPS_Rmc_Del *********************************************** -** -** Minimum recommended specific destructor -** -** @param [w] thys [GPS_PRmc *] rec min to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Rmc_Del(GPS_PRmc *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Rmb_New *********************************************** -** -** Minimum recommended nav constructor -** -** @return [GPS_PRmb] virgin minimum nav -**********************************************************************/ - -GPS_PRmb GPS_Rmb_New(void) -{ - GPS_PRmb ret; - - if(!(ret=(GPS_PRmb)malloc(sizeof(GPS_ORmb)))) - return NULL; - - ret->valid = 0; - *ret->owpt = *ret->dwpt = ret->warn = ret->correct = ret->alarm = '\0'; - ret->cross = ret->lat = ret->lon = ret->range = ret->True = ret->velocity = - (double)0.; - - return ret; -} - - - -/* @func GPS_Rmb_Del *********************************************** -** -** Minimum recommended nav destructor -** -** @param [w] thys [GPS_PRmb *] rec min nav to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Rmb_Del(GPS_PRmb *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Gga_New *********************************************** -** -** Fix constructor -** -** @return [GPS_PGga] virgin fix -**********************************************************************/ - -GPS_PGga GPS_Gga_New(void) -{ - GPS_PGga ret; - - if(!(ret=(GPS_PGga)malloc(sizeof(GPS_OGga)))) - return NULL; - - ret->time = (time_t)0.; - ret->valid = ret->qual = ret->nsat = ret->last = ret->dgpsid = 0; - ret->hdil = ret->lat = ret->lon = ret->alt = ret->galt = (double)0.; - - return ret; -} - - - -/* @func GPS_Gga_Del *********************************************** -** -** Fix destructor -** -** @param [w] thys [GPS_PGga *] fix to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Gga_Del(GPS_PGga *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Gsa_New *********************************************** -** -** DOP constructor -** -** @return [GPS_PGsa] virgin DOP -**********************************************************************/ - -GPS_PGsa GPS_Gsa_New(void) -{ - GPS_PGsa ret; - - if(!(ret=(GPS_PGsa)malloc(sizeof(GPS_OGsa)))) - return NULL; - - ret->type = '\0'; - ret->valid = ret->nsat = ret->fix = 0; - ret->pdop = ret->hdop = ret->vdop = (double)0.; - - return ret; -} - - - -/* @func GPS_Gsa_Del *********************************************** -** -** DOP destructor -** -** @param [w] thys [GPS_PGsa *] DOP to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Gsa_Del(GPS_PGsa *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Apb_New *********************************************** -** -** Autopilot B constructor -** -** @return [GPS_PApb] virgin autopilot -**********************************************************************/ - -GPS_PApb GPS_Apb_New(void) -{ - GPS_PApb ret; - - if(!(ret=(GPS_PApb)malloc(sizeof(GPS_OApb)))) - return NULL; - - ret->blink = ret->warn = ret->steer = ret->unit = ret->alarmc = - ret->alarmp = *ret->wpt = '\0'; - ret->valid = 0; - ret->edist = ret->od = ret->pd = ret->hdg = (double)0.; - - return ret; -} - - - -/* @func GPS_Apb_Del *********************************************** -** -** Autopilot destructor -** -** @param [w] thys [GPS_PApb *] autopilot to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Apb_Del(GPS_PApb *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Bwc_New *********************************************** -** -** Waypoint bng constructor -** -** @return [GPS_PBwc] virgin waypoint bng -**********************************************************************/ - -GPS_PBwc GPS_Bwc_New(void) -{ - GPS_PBwc ret; - - if(!(ret=(GPS_PBwc)malloc(sizeof(GPS_OBwc)))) - return NULL; - - *ret->wpt = '\0'; - ret->time = (time_t)0; - ret->valid = 0; - ret->lat = ret->lon = ret->True = ret->mag = ret->dist = (double)0.; - - return ret; -} - - - -/* @func GPS_Bwc_Del *********************************************** -** -** Waypoint bearing destructor -** -** @param [w] thys [GPS_PBwc *] waypoint bearing to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Bwc_Del(GPS_PBwc *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Bwr_New *********************************************** -** -** Waypoint bng rhumb constructor -** -** @return [GPS_PBwr] virgin waypoint bng -**********************************************************************/ - -GPS_PBwr GPS_Bwr_New(void) -{ - GPS_PBwr ret; - - if(!(ret=(GPS_PBwr)malloc(sizeof(GPS_OBwr)))) - return NULL; - - *ret->wpt = '\0'; - ret->time = (time_t)0; - ret->valid = 0; - ret->lat = ret->lon = ret->True = ret->mag = ret->dist = (double)0.; - - return ret; -} - - - -/* @func GPS_Bwr_Del *********************************************** -** -** Waypoint bearing rhumb destructor -** -** @param [w] thys [GPS_PBwr *] waypoint bearing rhumb to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Bwr_Del(GPS_PBwr *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Dbt_New *********************************************** -** -** Depth constructor -** -** @return [GPS_PDbt] virgin depth -**********************************************************************/ - -GPS_PDbt GPS_Dbt_New(void) -{ - GPS_PDbt ret; - - if(!(ret=(GPS_PDbt)malloc(sizeof(GPS_ODbt)))) - return NULL; - - ret->valid = 0; - ret->f = ret->m = (double)0.; - - return ret; -} - - - -/* @func GPS_Dbt_Del *********************************************** -** -** Depth destructor -** -** @param [w] thys [GPS_PDbt *] depth to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Dbt_Del(GPS_PDbt *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Hdm_New *********************************************** -** -** Magnetic heading constructor -** -** @return [GPS_PHdm] virgin hdg -**********************************************************************/ - -GPS_PHdm GPS_Hdm_New(void) -{ - GPS_PHdm ret; - - if(!(ret=(GPS_PHdm)malloc(sizeof(GPS_OHdm)))) - return NULL; - - ret->valid = 0; - ret->hdg = (double)0.; - - return ret; -} - - - -/* @func GPS_Hdm_Del *********************************************** -** -** Magnetic heading destructor -** -** @param [w] thys [GPS_PHdm *] mag hdg to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Hdm_Del(GPS_PHdm *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Hsc_New *********************************************** -** -** Heading to steer constructor -** -** @return [GPS_PHsc] virgin hdg -**********************************************************************/ - -GPS_PHsc GPS_Hsc_New(void) -{ - GPS_PHsc ret; - - if(!(ret=(GPS_PHsc)malloc(sizeof(GPS_OHsc)))) - return NULL; - - ret->valid = 0; - ret->True = ret->mag = (double)0.; - - return ret; -} - - - -/* @func GPS_Hsc_Del *********************************************** -** -** Heading to steer destructor -** -** @param [w] thys [GPS_PHsc *] hdg to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Hsc_Del(GPS_PHsc *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Mtw_New *********************************************** -** -** Water temp constructor -** -** @return [GPS_PMtw] virgin temp -**********************************************************************/ - -GPS_PMtw GPS_Mtw_New(void) -{ - GPS_PMtw ret; - - if(!(ret=(GPS_PMtw)malloc(sizeof(GPS_OMtw)))) - return NULL; - - ret->valid = 0; - ret->T = (double)0.; - - return ret; -} - - - -/* @func GPS_Mtw_Del *********************************************** -** -** Water temperature destructor -** -** @param [w] thys [GPS_PMtw *] water temp to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Mtw_Del(GPS_PMtw *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_R00_New *********************************************** -** -** Waypoint list constructor -** -** @return [GPS_PR00] virgin wpt list -**********************************************************************/ - -GPS_PR00 GPS_R00_New(void) -{ - GPS_PR00 ret; - - if(!(ret=(GPS_PR00)malloc(sizeof(GPS_OR00)))) - return NULL; - - ret->valid = 0; - *ret->wpts='\0'; - - return ret; -} - - - -/* @func GPS_R00_Del *********************************************** -** -** Waypoint list destructor -** -** @param [w] thys [GPS_PR00 *] waypoint list to delete -** -** @return [void] -**********************************************************************/ - -void GPS_R00_Del(GPS_PR00 *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Vhw_New *********************************************** -** -** Water speed constructor -** -** @return [GPS_PVhw] virgin water speed -**********************************************************************/ - -GPS_PVhw GPS_Vhw_New(void) -{ - GPS_PVhw ret; - - if(!(ret=(GPS_PVhw)malloc(sizeof(GPS_OVhw)))) - return NULL; - - ret->valid = 0; - ret->True = ret->mag = ret->wspeed = ret->speed = (double)0.; - - return ret; -} - - - -/* @func GPS_Vhw_Del *********************************************** -** -** Water speed destructor -** -** @param [w] thys [GPS_PVhw *] waypoint list to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Vhw_Del(GPS_PVhw *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Vwr_New *********************************************** -** -** Wind constructor -** -** @return [GPS_PVwr] virgin wind -**********************************************************************/ - -GPS_PVwr GPS_Vwr_New(void) -{ - GPS_PVwr ret; - - if(!(ret=(GPS_PVwr)malloc(sizeof(GPS_OVwr)))) - return NULL; - - ret->wdir = '\0'; - ret->valid = 0; - ret->wind = ret->knots = ret->ms = ret->khr = (double)0.; - - return ret; -} - - - -/* @func GPS_Vwr_Del *********************************************** -** -** Wind destructor -** -** @param [w] thys [GPS_PVwr *] wind to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Vwr_Del(GPS_PVwr *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Vtg_New *********************************************** -** -** Track made good constructor -** -** @return [GPS_PVtg] virgin tmg -**********************************************************************/ - -GPS_PVtg GPS_Vtg_New(void) -{ - GPS_PVtg ret; - - if(!(ret=(GPS_PVtg)malloc(sizeof(GPS_OVtg)))) - return NULL; - - ret->valid = 0; - ret->True = ret->mag = ret->knots = ret->khr = (double)0.; - - return ret; -} - - - -/* @func GPS_Vtg_Del *********************************************** -** -** Track made good destructor -** -** @param [w] thys [GPS_PVtg *] tmg to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Vtg_Del(GPS_PVtg *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Xte_New *********************************************** -** -** Cross track error constructor -** -** @return [GPS_Xte] virgin xte -**********************************************************************/ - -GPS_PXte GPS_Xte_New(void) -{ - GPS_PXte ret; - - if(!(ret=(GPS_PXte)malloc(sizeof(GPS_OXte)))) - return NULL; - - ret->valid = 0; - ret->warn = ret->cycle = ret->steer = ret->unit = '\0'; - ret->dist = (double)0.; - - return ret; -} - - - -/* @func GPS_Xte_Del *********************************************** -** -** Cross track error destructor -** -** @param [w] thys [GPS_PXte *] xte to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Xte_Del(GPS_PXte *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Xtr_New *********************************************** -** -** Cross track error dead constructor -** -** @return [GPS_Xtr] virgin xtr -**********************************************************************/ - -GPS_PXtr GPS_Xtr_New(void) -{ - GPS_PXtr ret; - - if(!(ret=(GPS_PXtr)malloc(sizeof(GPS_OXtr)))) - return NULL; - - ret->valid = 0; - ret->steer = ret->unit = '\0'; - ret->dist = (double)0.; - - return ret; -} - - - -/* @func GPS_Xtr_Del *********************************************** -** -** Cross track error dead destructor -** -** @param [w] thys [GPS_PXtr *] xtr to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Xtr_Del(GPS_PXtr *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Lib_New *********************************************** -** -** Link constructor -** -** @return [GPS_Lib] virgin link -**********************************************************************/ - -GPS_PLib GPS_Lib_New(void) -{ - GPS_PLib ret; - - if(!(ret=(GPS_PLib)malloc(sizeof(GPS_OLib)))) - return NULL; - - ret->valid = 0; - ret->rqst = '\0'; - ret->freq = ret->baud = (double)0.; - - return ret; -} - - - -/* @func GPS_Lib_Del *********************************************** -** -** Link destructor -** -** @param [w] thys [GPS_PLib *] link to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Lib_Del(GPS_PLib *thys) -{ - free((void *)*thys); - - return; -} - - - - -/* @func GPS_Nmea_New *********************************************** -** -** Nmea data constructor -** -** @return [GPS_PNmea] virgin nmea data -**********************************************************************/ - -GPS_PNmea GPS_Nmea_New(void) -{ - GPS_PNmea ret; - - if(!(ret=(GPS_PNmea)malloc(sizeof(GPS_ONmea)))) - return NULL; - - ret->gsv = GPS_Gsv_New(); - ret->rme = GPS_Rme_New(); - ret->gll = GPS_Gll_New(); - ret->rmz = GPS_Rmz_New(); - ret->rmm = GPS_Rmm_New(); - ret->bod = GPS_Bod_New(); - ret->rte = GPS_Rte_New(); - ret->wpl = GPS_Wpl_New(); - ret->rmc = GPS_Rmc_New(); - ret->rmb = GPS_Rmb_New(); - ret->gga = GPS_Gga_New(); - ret->gsa = GPS_Gsa_New(); - ret->apb = GPS_Apb_New(); - ret->bwc = GPS_Bwc_New(); - ret->bwr = GPS_Bwr_New(); - ret->dbt = GPS_Dbt_New(); - ret->hdm = GPS_Hdm_New(); - ret->hsc = GPS_Hsc_New(); - ret->mtw = GPS_Mtw_New(); - ret->r00 = GPS_R00_New(); - ret->vhw = GPS_Vhw_New(); - ret->vwr = GPS_Vwr_New(); - ret->vtg = GPS_Vtg_New(); - ret->xte = GPS_Xte_New(); - ret->xtr = GPS_Xtr_New(); - ret->lib = GPS_Lib_New(); - - return ret; -} - - - -/* @func GPS_Nmea_Del *********************************************** -** -** NMEA data destructor -** -** @param [w] thys [GPS_PNmea *] nmea data to delete -** -** @return [void] -**********************************************************************/ - -void GPS_Nmea_Del(GPS_PNmea *thys) -{ - - GPS_Gsv_Del(&(*thys)->gsv); - GPS_Rme_Del(&(*thys)->rme); - GPS_Gll_Del(&(*thys)->gll); - GPS_Rmz_Del(&(*thys)->rmz); - GPS_Rmm_Del(&(*thys)->rmm); - GPS_Bod_Del(&(*thys)->bod); - GPS_Rte_Del(&(*thys)->rte); - GPS_Wpl_Del(&(*thys)->wpl); - GPS_Rmc_Del(&(*thys)->rmc); - GPS_Rmb_Del(&(*thys)->rmb); - GPS_Gga_Del(&(*thys)->gga); - GPS_Gsa_Del(&(*thys)->gsa); - GPS_Apb_Del(&(*thys)->apb); - GPS_Bwc_Del(&(*thys)->bwc); - GPS_Bwr_Del(&(*thys)->bwr); - GPS_Dbt_Del(&(*thys)->dbt); - GPS_Hdm_Del(&(*thys)->hdm); - GPS_Hsc_Del(&(*thys)->hsc); - GPS_Mtw_Del(&(*thys)->mtw); - GPS_R00_Del(&(*thys)->r00); - GPS_Vhw_Del(&(*thys)->vhw); - GPS_Vwr_Del(&(*thys)->vwr); - GPS_Vtg_Del(&(*thys)->vtg); - GPS_Xte_Del(&(*thys)->xte); - GPS_Xtr_Del(&(*thys)->xtr); - GPS_Lib_Del(&(*thys)->lib); - - free((void *)*thys); - - return; -} diff --git a/gpsbabel/jeeps/gpsmem.h b/gpsbabel/jeeps/gpsmem.h index 8a52fad2e..f4e5f505d 100644 --- a/gpsbabel/jeeps/gpsmem.h +++ b/gpsbabel/jeeps/gpsmem.h @@ -20,67 +20,6 @@ void GPS_Track_Del(GPS_PTrack *thys); GPS_PWay GPS_Way_New(void); void GPS_Way_Del(GPS_PWay *thys); - -/* - * NMEA Section - */ -GPS_PGsv GPS_Gsv_New(void); -void GPS_Gsv_Del(GPS_PGsv *thys); -GPS_PRme GPS_Rme_New(void); -void GPS_Rme_Del(GPS_PRme *thys); -GPS_PGll GPS_Gll_New(void); -void GPS_Gll_Del(GPS_PGll *thys); -GPS_PRmz GPS_Rmz_New(void); -void GPS_Rmz_Del(GPS_PRmz *thys); -GPS_PRmm GPS_Rmm_New(void); -void GPS_Rmm_Del(GPS_PRmm *thys); -GPS_PBod GPS_Bod_New(void); -void GPS_Bod_Del(GPS_PBod *thys); -GPS_PRte GPS_Rte_New(void); -void GPS_Rte_Del(GPS_PRte *thys); -GPS_PRmc GPS_Rmc_New(void); -void GPS_Rmc_Del(GPS_PRmc *thys); -GPS_PRmb GPS_Rmb_New(void); -void GPS_Rmb_Del(GPS_PRmb *thys); -GPS_PGga GPS_Gga_New(void); -void GPS_Gga_Del(GPS_PGga *thys); -GPS_PGsa GPS_Gsa_New(void); -void GPS_Gsa_Del(GPS_PGsa *thys); -GPS_PApb GPS_Apb_New(void); -void GPS_Apb_Del(GPS_PApb *thys); -GPS_PBwc GPS_Bwc_New(void); -void GPS_Bwc_Del(GPS_PBwc *thys); -GPS_PBwr GPS_Bwr_New(void); -void GPS_Bwr_Del(GPS_PBwr *thys); -GPS_PDbt GPS_Dbt_New(void); -void GPS_Dbt_Del(GPS_PDbt *thys); -GPS_PHdm GPS_Hdm_New(void); -void GPS_Hdm_Del(GPS_PHdm *thys); -GPS_PHsc GPS_Hsc_New(void); -void GPS_Hsc_Del(GPS_PHsc *thys); -GPS_PMtw GPS_Mtw_New(void); -void GPS_Mtw_Del(GPS_PMtw *thys); -GPS_PR00 GPS_R00_New(void); -void GPS_R00_Del(GPS_PR00 *thys); -GPS_PVhw GPS_Vhw_New(void); -void GPS_Vhw_Del(GPS_PVhw *thys); -GPS_PVwr GPS_Vwr_New(void); -void GPS_Vwr_Del(GPS_PVwr *thys); -GPS_PVtg GPS_Vtg_New(void); -void GPS_Vtg_Del(GPS_PVtg *thys); -GPS_PXte GPS_Xte_New(void); -void GPS_Xte_Del(GPS_PXte *thys); -GPS_PXtr GPS_Xtr_New(void); -void GPS_Xtr_Del(GPS_PXtr *thys); -GPS_PLib GPS_Lib_New(void); -void GPS_Lib_Del(GPS_PLib *thys); -GPS_PWpl GPS_Wpl_New(void); -void GPS_Wpl_Del(GPS_PWpl *thys); -GPS_PNmea GPS_Nmea_New(void); -void GPS_Nmea_Del(GPS_PNmea *thys); - - - #endif #ifdef __cplusplus diff --git a/gpsbabel/jeeps/gpsnmea.h b/gpsbabel/jeeps/gpsnmea.h deleted file mode 100644 index 53255c65a..000000000 --- a/gpsbabel/jeeps/gpsnmea.h +++ /dev/null @@ -1,312 +0,0 @@ -#ifdef __cplusplus -extern "C" -{ -#endif - -#ifndef gpsnmea_h -#define gpsnmea_h - - -#include "gps.h" - - -typedef struct GPS_SGsv -{ - int32 inview; - int32 prn[32]; - int32 elevation[32]; - int32 azimuth[32]; - int32 strength[32]; - int32 valid; -} GPS_OGsv,*GPS_PGsv; - -typedef struct GPS_SRme -{ - double hpe; - double vpe; - double spe; - int32 valid; -} GPS_ORme,*GPS_PRme; - -typedef struct GPS_SGll -{ - double lat; - double lon; - time_t time; - char dv; - int32 valid; -} GPS_OGll,*GPS_PGll; - -typedef struct GPS_SRmz -{ - int32 height; - int32 dim; - int32 valid; -} GPS_ORmz,*GPS_PRmz; - -typedef struct GPS_SRmm -{ - char datum[83]; - int32 valid; -} GPS_ORmm,*GPS_PRmm; - -typedef struct GPS_SBod -{ - double True; - double mag; - char dest[83]; - char start[83]; - int32 valid; -} GPS_OBod,*GPS_PBod; - -typedef struct GPS_SRte -{ - char type; - int32 rte; - char *wpts; - int32 valid; -} GPS_ORte,*GPS_PRte; - -typedef struct GPS_SWpl -{ - double lat; - double lon; - char wpt[83]; - int32 valid; -} GPS_OWpl,*GPS_PWpl; - -typedef struct GPS_SRmc -{ - time_t time; - char warn; - double lat; - double lon; - double speed; - double cmg; - char date[83]; - double magvar; - int32 valid; -} GPS_ORmc,*GPS_PRmc; - -typedef struct GPS_SRmb -{ - char warn; - double cross; - char correct; - char owpt[83]; - char dwpt[83]; - double lat; - double lon; - double range; - double True; - double velocity; - char alarm; - int32 valid; -} GPS_ORmb,*GPS_PRmb; - -typedef struct GPS_SGga -{ - time_t time; - double lat; - double lon; - int32 qual; - int32 nsat; - double hdil; - double alt; - double galt; - int32 last; - int32 dgpsid; - int32 valid; -} GPS_OGga,*GPS_PGga; - -typedef struct GPS_SGsa -{ - char type; - int32 fix; - int32 nsat; - int32 prn[12]; - double pdop; - double hdop; - double vdop; - int32 valid; -} GPS_OGsa,*GPS_PGsa; - -typedef struct GPS_SApb -{ - char blink; - char warn; - double edist; - char steer; - char unit; - char alarmc; - char alarmp; - double od; - char wpt[83]; - double pd; - double hdg; - int32 valid; -} GPS_OApb,*GPS_PApb; - -typedef struct GPS_SBwc -{ - time_t time; - double lat; - double lon; - double True; - double mag; - double dist; - char wpt[83]; - int32 valid; -} GPS_OBwc,*GPS_PBwc; - -typedef struct GPS_SBwr -{ - time_t time; - double lat; - double lon; - double True; - double mag; - double dist; - char wpt[83]; - int32 valid; -} GPS_OBwr,*GPS_PBwr; - -typedef struct GPS_SDbt -{ - double f; - double m; - int32 valid; -} GPS_ODbt,*GPS_PDbt; - -typedef struct GPS_SHdm -{ - double hdg; - int32 valid; -} GPS_OHdm,*GPS_PHdm; - -typedef struct GPS_SHsc -{ - double True; - double mag; - int32 valid; -} GPS_OHsc,*GPS_PHsc; - -typedef struct GPS_SMtw -{ - double T; - int32 valid; -} GPS_OMtw,*GPS_PMtw; - -typedef struct GPS_SR00 -{ - char wpts[83]; - int32 valid; -} GPS_OR00,*GPS_PR00; - -typedef struct GPS_SVhw -{ - double True; - double mag; - double wspeed; - double speed; - int32 valid; -} GPS_OVhw,*GPS_PVhw; - -typedef struct GPS_SVwr -{ - double wind; - char wdir; - double knots; - double ms; - double khr; - int32 valid; -} GPS_OVwr,*GPS_PVwr; - -typedef struct GPS_SVtg -{ - double True; - double mag; - double knots; - double khr; - int32 valid; -} GPS_OVtg,*GPS_PVtg; - -typedef struct GPS_SXte -{ - char warn; - char cycle; - double dist; - char steer; - char unit; - int32 valid; -} GPS_OXte,*GPS_PXte; - -typedef struct GPS_SXtr -{ - double dist; - char steer; - char unit; - int32 valid; -} GPS_OXtr,*GPS_PXtr; - -typedef struct GPS_SLib -{ - double freq; - double baud; - char rqst; - int32 valid; -} GPS_OLib,*GPS_PLib; - - -typedef struct GPS_SNmea -{ - GPS_PGsv gsv; - GPS_PRme rme; - GPS_PGll gll; - GPS_PRmz rmz; - GPS_PRmm rmm; - GPS_PBod bod; - GPS_PRte rte; - GPS_PWpl wpl; - GPS_PRmc rmc; - GPS_PRmb rmb; - GPS_PGga gga; - GPS_PGsa gsa; - GPS_PApb apb; - GPS_PBwc bwc; - GPS_PBwr bwr; - GPS_PDbt dbt; - GPS_PHdm hdm; - GPS_PHsc hsc; - GPS_PMtw mtw; - GPS_PR00 r00; - GPS_PVhw vhw; - GPS_PVwr vwr; - GPS_PVtg vtg; - GPS_PXte xte; - GPS_PXtr xtr; - GPS_PLib lib; -} GPS_ONmea,*GPS_PNmea; - - - - - - -extern int32 gps_fd; /* FD for serial port access [NMEA] */ -extern GPS_PNmea gps_nmea; /* Internal nmea data repository */ - - - -void GPS_NMEA_Add_Checksum(char *s); -int32 GPS_NMEA_Line_Check(const char *s); -int32 GPS_NMEA_Load(int32 fd); -int32 GPS_NMEA_Init(const char *s); -void GPS_NMEA_Exit(void); -int32 GPS_NMEA_Send(const char *s, int32 flag); - -#endif - -#ifdef __cplusplus -} -#endif diff --git a/gpsbabel/jeeps/gpsnmeafmt.h b/gpsbabel/jeeps/gpsnmeafmt.h deleted file mode 100644 index 91d38041c..000000000 --- a/gpsbabel/jeeps/gpsnmeafmt.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifdef __cplusplus -extern "C" -{ -#endif - -#ifndef gpsnmeafmt_h -#define gpsnmeafmt_h - - -#include "gps.h" - -int32 GPS_NMEA_Apb_Scan(const char *s, GPS_PApb *thys); -int32 GPS_NMEA_Bod_Scan(const char *s, GPS_PBod *thys); -int32 GPS_NMEA_Bwc_Scan(const char *s, GPS_PBwc *thys); -int32 GPS_NMEA_Bwr_Scan(const char *s, GPS_PBwr *thys); -int32 GPS_NMEA_Dbt_Scan(const char *s, GPS_PDbt *thys); -int32 GPS_NMEA_Gga_Scan(const char *s, GPS_PGga *thys); -int32 GPS_NMEA_Gll_Scan(const char *s, GPS_PGll *thys); -int32 GPS_NMEA_Gsa_Scan(const char *s, GPS_PGsa *thys); -int32 GPS_NMEA_Gsv_Scan(const char *s, GPS_PGsv *thys); -int32 GPS_NMEA_Hdm_Scan(const char *s, GPS_PHdm *thys); -int32 GPS_NMEA_Hsc_Scan(const char *s, GPS_PHsc *thys); -int32 GPS_NMEA_Mtw_Scan(const char *s, GPS_PMtw *thys); -int32 GPS_NMEA_R00_Scan(const char *s, GPS_PR00 *thys); -int32 GPS_NMEA_Rmb_Scan(const char *s, GPS_PRmb *thys); -int32 GPS_NMEA_Rmc_Scan(const char *s, GPS_PRmc *thys); -int32 GPS_NMEA_Rte_Scan(const char *s, GPS_PRte *thys); -int32 GPS_NMEA_Vhw_Scan(const char *s, GPS_PVhw *thys); -int32 GPS_NMEA_Vwr_Scan(const char *s, GPS_PVwr *thys); -int32 GPS_NMEA_Vtg_Scan(const char *s, GPS_PVtg *thys); -int32 GPS_NMEA_Wpl_Scan(const char *s, GPS_PWpl *thys); -int32 GPS_NMEA_Xte_Scan(const char *s, GPS_PXte *thys); -int32 GPS_NMEA_Xtr_Scan(const char *s, GPS_PXtr *thys); -int32 GPS_NMEA_Rme_Scan(const char *s, GPS_PRme *thys); -int32 GPS_NMEA_Rmz_Scan(const char *s, GPS_PRmz *thys); -int32 GPS_NMEA_Rmm_Scan(const char *s, GPS_PRmm *thys); -int32 GPS_NMEA_Lib_Scan(const char *s, GPS_PLib *thys); - - -#endif - -#ifdef __cplusplus -} -#endif diff --git a/gpsbabel/jeeps/gpsnmeaget.h b/gpsbabel/jeeps/gpsnmeaget.h deleted file mode 100644 index 17cba4801..000000000 --- a/gpsbabel/jeeps/gpsnmeaget.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifdef __cplusplus -extern "C" -{ -#endif - -#ifndef gpsnmearead_h -#define gpsnmearead_h - - -#include "gps.h" - -int32 GPS_NMEA_Get_Apb(GPS_PApb *thys); -int32 GPS_NMEA_Get_Bod(GPS_PBod *thys); -int32 GPS_NMEA_Get_Bwc(GPS_PBwc *thys); -int32 GPS_NMEA_Get_Bwr(GPS_PBwr *thys); -int32 GPS_NMEA_Get_Dbt(GPS_PDbt *thys); -int32 GPS_NMEA_Get_Gga(GPS_PGga *thys); -int32 GPS_NMEA_Get_Gll(GPS_PGll *thys); -int32 GPS_NMEA_Get_Gsa(GPS_PGsa *thys); -int32 GPS_NMEA_Get_Gsv(GPS_PGsv *thys); -int32 GPS_NMEA_Get_Hdm(GPS_PHdm *thys); -int32 GPS_NMEA_Get_Hsc(GPS_PHsc *thys); -int32 GPS_NMEA_Get_Mtw(GPS_PMtw *thys); -int32 GPS_NMEA_Get_R00(GPS_PR00 *thys); -int32 GPS_NMEA_Get_Rmb(GPS_PRmb *thys); -int32 GPS_NMEA_Get_Rmc(GPS_PRmc *thys); -int32 GPS_NMEA_Get_Rte(GPS_PRte *thys); -int32 GPS_NMEA_Get_Vhw(GPS_PVhw *thys); -int32 GPS_NMEA_Get_Vwr(GPS_PVwr *thys); -int32 GPS_NMEA_Get_Vtg(GPS_PVtg *thys); -int32 GPS_NMEA_Get_Wpl(GPS_PWpl *thys); -int32 GPS_NMEA_Get_Xte(GPS_PXte *thys); -int32 GPS_NMEA_Get_Xtr(GPS_PXtr *thys); -int32 GPS_NMEA_Get_Rme(GPS_PRme *thys); -int32 GPS_NMEA_Get_Rmz(GPS_PRmz *thys); -int32 GPS_NMEA_Get_Rmm(GPS_PRmm *thys); -int32 GPS_NMEA_Get_Lib(GPS_PLib *thys); - -#endif - -#ifdef __cplusplus -} -#endif diff --git a/gpsbabel/jeeps/gpsserial.c b/gpsbabel/jeeps/gpsserial.c index ae22dd431..0da43cf2e 100644 --- a/gpsbabel/jeeps/gpsserial.c +++ b/gpsbabel/jeeps/gpsserial.c @@ -595,96 +595,4 @@ int32 GPS_Serial_Off(const char *port, int32 fd) return 1; } - - - - - - -/* @func GPS_Serial_Open_NMEA ****************************************** -** -** Open a serial port 8bits 1 stop bit 4800 baud -** -** @param [w] fd [int32 *] file descriptor -** @param [r] port [const char *] port e.g. ttyS1 -** -** @return [int32] false upon error -************************************************************************/ - -int32 GPS_Serial_Open_NMEA(int32 *fd, const char *port) -{ - struct termios tty; - - - if((*fd = open(port, O_RDWR | O_NDELAY | O_NOCTTY))==-1) - { - perror("open"); - GPS_Error("SERIAL: Cannot open serial port"); - gps_errno = SERIAL_ERROR; - return 0; - } - - - if(tcgetattr(*fd,&tty)==-1) - { - perror("tcgetattr"); - GPS_Error("SERIAL: tcgetattr error"); - gps_errno = SERIAL_ERROR; - return 0; - } - - - tty.c_cflag |= (CREAD | CS8 | CSIZE | CLOCAL); - cfsetospeed(&tty,B4800); - cfsetispeed(&tty,B4800); - - tty.c_lflag &= 0x0; - tty.c_iflag &= 0x0; - tty.c_oflag &= 0x0; - - - if(tcsetattr(*fd,TCSANOW,&tty)==-1) - { - perror("tcsetattr"); - GPS_Error("SERIAL: tcsetattr error"); - return 0; - } - - return 1; -} - - - - - - - -/* @func GPS_Serial_On_NMEA ******************************************** -** -** Set up port for NMEA -** -** @param [r] port [const char *] port -** @param [w] fd [int32 *] file descriptor -** -** @return [int32] success -************************************************************************/ -int32 GPS_Serial_On_NMEA(const char *port, int32 *fd) -{ - - if(!GPS_Serial_Savetty(port)) - { - GPS_Error("Cannot access serial port '%s'", port); - gps_errno = SERIAL_ERROR; - return 0; - } - - if(!GPS_Serial_Open_NMEA(fd,port)) - { - GPS_Error("Cannot open serial port '%s'", port); - gps_errno = SERIAL_ERROR; - return 0; - } - - return 1; -} #endif /* __WIN32__ */ -- 2.30.2